Fix misc issues found with java-client+recordings #1945
+376
−327
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.